From cf030e9ffc459da3b5322958b4302c7b80e9a1ae Mon Sep 17 00:00:00 2001
From: Benjamin Otte <otte@redhat.com>
Date: Sat, 3 Feb 2018 15:47:41 +0100
Subject: [PATCH] rbtree: Privatize header

According to meson it's the only private header that doesn't conform to
the *private.h naming.

Fix that.
---
 gtk/gtkrbtree.c                         | 2 +-
 gtk/{gtkrbtree.h => gtkrbtreeprivate.h} | 8 ++++----
 gtk/gtktreeprivate.h                    | 2 +-
 gtk/gtktreeselection.c                  | 2 +-
 gtk/gtktreeview.c                       | 2 +-
 gtk/meson.build                         | 5 -----
 testsuite/gtk/rbtree.c                  | 2 +-
 7 files changed, 9 insertions(+), 14 deletions(-)
 rename gtk/{gtkrbtree.h => gtkrbtreeprivate.h} (98%)

diff --git a/gtk/gtkrbtree.c b/gtk/gtkrbtree.c
index 464b785b05..a21b093d5e 100644
--- a/gtk/gtkrbtree.c
+++ b/gtk/gtkrbtree.c
@@ -16,7 +16,7 @@
  */
 
 #include "config.h"
-#include "gtkrbtree.h"
+#include "gtkrbtreeprivate.h"
 #include "gtkdebug.h"
 
 static GtkRBNode * _gtk_rbnode_new                (GtkRBTree  *tree,
diff --git a/gtk/gtkrbtree.h b/gtk/gtkrbtreeprivate.h
similarity index 98%
rename from gtk/gtkrbtree.h
rename to gtk/gtkrbtreeprivate.h
index 9e088a1b18..7d0e2ffdf5 100644
--- a/gtk/gtkrbtree.h
+++ b/gtk/gtkrbtreeprivate.h
@@ -1,4 +1,4 @@
-/* gtkrbtree.h
+/* gtkrbtreeprivate.h
  * Copyright (C) 2000  Red Hat, Inc.,  Jonathan Blandford <jrb@redhat.com>
  *
  * This library is free software; you can redistribute it and/or
@@ -17,8 +17,8 @@
 
 /* A Red-Black Tree implementation used specifically by GtkTreeView.
  */
-#ifndef __GTK_RBTREE_H__
-#define __GTK_RBTREE_H__
+#ifndef __GTK_RBTREE_PRIVATE_H__
+#define __GTK_RBTREE_PRIVATE_H__
 
 #include <glib.h>
 
@@ -169,4 +169,4 @@ gint       _gtk_rbtree_get_depth        (GtkRBTree              *tree);
 G_END_DECLS
 
 
-#endif /* __GTK_RBTREE_H__ */
+#endif /* __GTK_RBTREE_PRIVATE_H__ */
diff --git a/gtk/gtktreeprivate.h b/gtk/gtktreeprivate.h
index 0fc888ee3f..50a99828bd 100644
--- a/gtk/gtktreeprivate.h
+++ b/gtk/gtktreeprivate.h
@@ -21,7 +21,7 @@
 
 #include <gtk/gtktreeview.h>
 #include <gtk/gtktreeselection.h>
-#include <gtk/gtkrbtree.h>
+#include <gtk/gtkrbtreeprivate.h>
 
 G_BEGIN_DECLS
 
diff --git a/gtk/gtktreeselection.c b/gtk/gtktreeselection.c
index 1bb43fcc3d..1a4db396ef 100644
--- a/gtk/gtktreeselection.c
+++ b/gtk/gtktreeselection.c
@@ -19,7 +19,7 @@
 #include <string.h>
 #include "gtktreeselection.h"
 #include "gtktreeprivate.h"
-#include "gtkrbtree.h"
+#include "gtkrbtreeprivate.h"
 #include "gtkmarshalers.h"
 #include "gtkintl.h"
 #include "gtkprivate.h"
diff --git a/gtk/gtktreeview.c b/gtk/gtktreeview.c
index eca6182a49..b9433e56e6 100644
--- a/gtk/gtktreeview.c
+++ b/gtk/gtktreeview.c
@@ -28,7 +28,7 @@
 
 #include "gtkadjustmentprivate.h"
 #include "gtkcssnumbervalueprivate.h"
-#include "gtkrbtree.h"
+#include "gtkrbtreeprivate.h"
 #include "gtktreednd.h"
 #include "gtktreeprivate.h"
 #include "gtkcellrenderer.h"
diff --git a/gtk/meson.build b/gtk/meson.build
index e3e5c7d350..b0888d5365 100644
--- a/gtk/meson.build
+++ b/gtk/meson.build
@@ -366,10 +366,6 @@ gtk_private_type_headers = files([
   'gtkeventcontrollerlegacyprivate.h',
 ])
 
-gtk_private_headers = gtk_private_type_headers + files([
-  'gtkrbtree.h',
-])
-
 gtk_public_headers = files([
   'gtkaboutdialog.h',
   'gtkaccelgroup.h',
@@ -748,7 +744,6 @@ typefuncs = custom_target('gtktypefuncs.inc',
                           input: gdk_headers +
                             gtk_public_headers +
                             gtk_deprecated_headers +
-                            gtk_private_headers +
                             [ gtktypebuiltins_h, ] +
                             [ gdkenum_h, gskenum_h, ],
                           command: [
diff --git a/testsuite/gtk/rbtree.c b/testsuite/gtk/rbtree.c
index e730897764..513c6abb67 100644
--- a/testsuite/gtk/rbtree.c
+++ b/testsuite/gtk/rbtree.c
@@ -19,7 +19,7 @@
 
 #include <locale.h>
 
-#include "../../gtk/gtkrbtree.h"
+#include "../../gtk/gtkrbtreeprivate.h"
 
 /* _gtk_rbtree_test */
 
-- 
2.30.2